Merge pull request #3 from Reselence/master

Up to date
Merge remote-tracking branch 'origin/OwenCode' into StefanCode