Typos on 18
Merge pull request #65 from j0k3r/migrate_to_sf2_3

Typos on 18