#24

Minor Bugfixes