Added integer type conversion.
Fixed indentation.
Added v0.10 support and moved things into implementation files