Merge pull request #31 from chrqls/dev

[Issue 22]