Fixed #529
merge with master
fixed merge conflicts
let's save files before checking them in!