Added master branch source directory.
Merge branch 'master' into dev for development