initial commit
added submodules
Merge remote-tracking branch 'upstream/master'