Merge pull request #1 from code4craft/master

merge