Merge pull request #82 from chrqls/dev

[#69] Reverting manually changes made in commit 0b2be57