Just trolling part 2.
Merge pull request #3 from lenorris/master

Test pull request #2