Merge commit
added *.pyc, fixed *.elc