merged peacemoon/master