Various tweaks
Merge branch 'master' of github.com:calio/luangx

Conflicts:
	luangx