My submission
Merge pull request #279 from nands/master

My submission