merge development branch

Nice use of a custom exception. Probably unnecessary though. :)