did some stuff
Merge branch 'master' into john
merged john's branch with mine