Merge pull request #47 from rezen:patch-1