Updates to raw conversion
Merge pull request #21 from hegsie/master

Updates to raw conversion