added master 5
Merge branch 'master' into crazy