Bugfixes2

Test merging in github 101