cleaned up code
Merge branch 'master' of https://github.com/mlfryman/python-conversion