Strict mode support

fixes #129 and #130 
Misread the `else` structure. :+1: