syncing issues
Merge branch 'master' into btchen