Just a little Update of the Version and stuff
Merge remote-tracking branch 'origin/master'