Merge pull request #26 from jakubjosef/master

Improved working with None due to weird YAML get() behaviour.