applying last fixes...
applying latest bugfix
Merge branch 'release/0.1' into develop