kragniz Merge pull request #24 from tcyrus/patch-1 …