Closes #18
Merge pull request #39 from as3boyan/master

Closes #18