Merge pull request #102 from amethystlei/master

System Test Phase support
Phase I Bug Fix