Merge pull request #12 from simonlopez/master

Better mandatory values check
Fixes #14