Closes #30
Merge pull request #33 from V01D-eXe/master

Closes #30