Initial commit, fixes #17 and #19
Merge pull request #1 from axniks/developer

Initial commit, fixes #17 and #19