my solution for #50
Merge pull request #1 from rubysolo/master

My solution for #50