a few small changes
resolved merge conflicts
Merge branch 'master' of https://github.com/arkleima/inits