Merge pull request #13 from anarcat/patch-1