some stuff I added
Merge branch 'master' of github.com:btcarey/test2