glasnt Merge pull request #52 from rougeth/patch-1