Merge branch 'dev'
authormatthew <matthew@owens.tech>
Sun, 5 Aug 2018 15:30:15 +0000 (16:30 +0100)
committermatthew <matthew@owens.tech>
Sun, 5 Aug 2018 15:30:15 +0000 (16:30 +0100)
implemented error messages


Trivial merge