working on version 2.0.0

not tested yet, work in progress