Merge pull request #32 from hoongman/master

merged changes from Keir