Merge pull request #2 from ngnagios/patch-1