working on it
Merge branch 'master' into jack
not working yet
nothing much
Merge branch 'jack'