Merge pull request #1 from crdx/master

merge