Merge pull request #87 from lukashaertel/master

Upload Fix
Merge pull request #89 from lukashaertel/master

Structural Updates
Merge pull request #92 from lukashaertel/master

Fixed maven poms
Merge remote-tracking branch 'upstream/master'