Error fix
Merge pull request #95 from duiker2/master

Error fix