Revert "Fix Bugs"
Merge pull request #17 from DeviceConnect/revert-16-master

Revert "Fix Bugs"