FIxes
Merge branch 'master' of github