Merge pull request #64 from unixorn/master

Update master for PR #63