Strict mode support

fixes #129 and #130 
might want to Debug assert this then.