Do merge changes in smotitah.el