melpa compatible
Merge pull request #1 from sindikat/master

MELPA compatibility