Unit tests pass with Phantom 2
Cleanup
Merge pull request #209 from bprodoehl/phantom2

Add support for Phantom 2