Merge pull request #16 from szilardhuber/master

Changed submodule url to https instead of git@
Merge remote-tracking branch 'upstream/master'