Phase IV Ready
Merge pull request #51 from lucaswalter/master

Phase IV Ready