Added phase two flag. Closes #87.
Merge branch 'add-phase-two-flag' into development