using elpa now.
Merge branch 'release/0.1'