Merge pull request #26 from chaosphere2112/master

JY Fixes