Merge pull request #1 from relatedcode/master

merge with latest