Bug Fix
Merge pull request #21 from boiving/master

Bug Fix