trying to conform to pep-8
Merge branch 'master' of https://github.com/AmritPatel/MADS