merge emanwebdev-master, fixes #40, #39