changed some small things
Merge branch 'master' into zach
Merge pull request #19 from Eye-Static/zach

Zach