fixed some issues

forgot to change branches tho :(
Merge remote-tracking branch 'origin/master' into 1.0-snapshot