Merge pull request #7 from FroboMind-SDU/master

Large pull request with a bunch of minor and major changes from SDU
Merge pull request #8 from FroboMind-SDU/master

Updates from SDU
Merge remote-tracking branch 'upstream/master'