Some Performance improvements
Merge branch 'master' of http://github.com/fordprefect480/oncall