Merge GnunuX code. Thanks!