Merge pull request #112 from chrqls/dev

[#110] Fixing a NullPointerException