Fixed #71
Merge pull request #76 from ProgramFOX/master

Fixed #71