Minor bugfixes version 0.0.1