More improvements as described in email
Merge branch 'master' of https://github.com/anwars/senior-design