Added the original files from basic Code Base
Merge branch 'master' into Alpha