Large amount of fixes and update, update Version number 0.3.1