Fixed some small issues
Merge pull request #14 from Echo3ToEcho7/master

Fixed some minor issues