0.1.4-Bugfixes

* Some Bugfixes