Merge pull request #1 from code4craft/master

Merge update from original author