Issue #1 fixed. (But does not work. Sorry, forgot to branch. Update soon.)