splitted in different files + bugfixes
Merge branch 'release/0.1.1'
Merge tag '0.1.1' into develop

0.1.1 release