Merge pull request #13 from Illyism/feat/convert-to-vs-from