init
minor fixes
Merge branch 'master'