Merge pull request #15 from tsagi/develop

Small Fixes
Use correct snakeyaml library