Massive cleanup
Merge pull request #2 from edenpulse/1.0

Massive cleanup