Pseudo-merge pull request #3 from Zeno-/master

Manual merge of Zeno-'s changes, with several revisions.