initial commit (moved from bitbucket)
Merge origin/master