ELPA compatibility
Merge pull request #1 from yasuyk/elpa-compatibility

ELPA compatibility