merging submodule changes in
Merge pull request #8 from Cara-Jo/master

merging submodule changes in