Phase I Bug Fix
Merge pull request #103 from amethystlei/master

Phase I Bug Fix