Minor improvments to case class conversion
Merge pull request #99 from gzm0/conversion-fixes

Minor improvments to case class conversion