Merge pull request #84 from chrqls/dev

[#60] No real change