Version 0.1: improvements + module
Version 0.1: improvements + module