Correct data conversions
Fixed broken indentation
Merge pull request #2 from asyncee/master

Correct data conversions