Phase I Ready
Merge pull request #21 from Shwam/master

Looks good. Phase 2!