Merge pull request #1 from Mindwerks/master

Need to update my source from yours
Merge pull request #48 from chrisisonwildcode/master

Update my source ...