Merge pull request #57 from j0k3r/migrate_to_sf2_3

Fix day 14 & 15