update
cleanup
Merge branch 'master' of https://github.com/ckonig/testing2014