Merge pull request #16 from eson57/patch-1