Phase III Ready
Merge pull request #50 from lucaswalter/master

Phase III Ready