[#39] Need to post this code for tests
Merge pull request #62 from chrqls/dev

[#39] Need to post this code for tests