Merged Yogi branch with master

added all files from yogi branch to master