Merge pull request #13 from rdebath/patch-fixes