Merge pull request #49 from j0k3r/migrate_to_sf2_3

Avent day 10