Merge branch '2.0' of https://github.com/bleonheart/Lilia into 2.0

Merge branch '2.0' of https://github.com/bleonheart/Lilia into 2.0 #18