merge latest maniacx source