Bugfixes concerning Issue #2 on OS X