Updated Conversions
Merge branch 'gh-pages' of https://github.com/Taig/Repository into gh-pages