Phase IV Ready

Let's do this!
Merge pull request #48 from Shwam/master

Nice work man.  Looks good.