phou's commit
Merge pull request #11 from Nuttdguy/master

phou's pull request