Merge pull request #13 from jacobg830/master

Some fixes