fixed bug
Fixing more
fixing things
ft
Merge branch 'master' into Andrew