Manual merge of branch "julian" into "master" (Fixes #58)