ELPA compatibility

See: http://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Headers.html#Library-Headers
Merge pull request #1 from sindikat/master

ELPA compatibility