Merge pull request #2 from roachhd/master

Removed
Merge pull request #3 from roachhd/workin

Merge pull request #2 from roachhd/master