Merge branch 'master' of auder.net:morpheus