Merge pull request #2 from jacobg830/master

Very minor bugfixes