Merge pull request #1 from Dameier/master

updating To latest
Merge pull request #3 from NathanBland/master

Merge pull request #1 from Dameier/master