Fix for issue #67
Merge pull request #100 from JoshuaEstes/Issue67

Fix for issue #67