strict checks
Merge pull request #81 from dereuromark/master-strict-checks

strict checks where applicable