Fixed issue with merge
Merge pull request #31 from SHeimlich/master

Fixed issue from last merge