Merge branch 'master' with some bug fixing