daytron's solution
Merge pull request #128 from Daytron/master

daytron's solution