more local changes
Merge branch 'feature' of https://github.com/zinggoat/ch1 into feature