Fixed #12 Add type cast for some string values