Merge pull request #4 from Reselence/StefanCode

Stefan code
Merge remote-tracking branch 'origin/OwenCode' into StefanCode