Bugfixes 18-10-14 202932

Resolved #1 and #2.