Update with skandal-master, and without Skandal3.0