fixed commit error
Merge pull request #5 from sstrucel/newmaster

Newmaster
Merge pull request #3 from sstrucel/master

getting shawns code again.