Fixes issue #3
Removed old code
Merge pull request #4 from zenduo/develop

Fixes issue #3