Merge pull request #253 from angathorion/auto-complete
Auto complete and other fixes

(main@d9088a40904dea375a89b4e907d089374635f567)