changes to ctb
Merge branch 'master' of http://github.com/ajb129/conversion