Phase III Ready
Merge pull request #31 from Shwam/master

Phase III Ready