Semi-fixes #3 and #4
With dirty hacks.
Revisit both issues soon and implement better solutions.
closes #5 (closed)