Bug Fix
Merge pull request #15 from oneski/master

Bug Fix