Update Phase to Phase II

Phase II is ready!
Merge pull request #28 from Shwam/master

Update from Phase I to Phase II