Merge pull request #195 from silkuze/patch-1