Merge branch 'master' of github.com:veltzer/xmeltdown