Merge pull request #207 from b3yond/patch-1