expansion from andreas
merge of init.el