Added new stuff, need to clean
Merge branch 'master' of github.com:elmom/MCAD into new_stuff
new code by Giles Bathgate
Merge branch 'master' of github.com:elmom/MCAD into new_stuff
Merge branch 'master' of github.com:elmom/MCAD into new_stuff
Merge pull request #2 from ArthurGibbs/new_stuff

New stuff