Merge remote-tracking branch 'origin/OwenCode' into StefanCode
Merge pull request #4 from Reselence/StefanCode

Stefan code
Merge pull request #5 from Reselence/OwenCode

Owen code