Martins First Commit
Merge branch 'master' into martin
Added functionality to glenns latest stuff in setup()
Merge pull request #2 from GSMCD/martin

Martin