this resolves #130, resolves #188, resolves #196, resolves #210
Merge branch 'master' of github.com:lisaslyis/aikuma into lisaslyis-master-3
Merge branch 'lisaslyis-master-3'