Merge pull request #113 from LandonVance/master

Basic bugs fixed