Merge pull request #1 from adam6806/master

I want your stuff
Merge pull request #10 from trevorcsmith/master

Fixed issues in last pull request.