Version 0.1: improvements + module