Merge pull request #34 from yomichi/develop

fix a typo
Fixed CMakeLists.txt for elpa
Merge remote-tracking branch 'origin/develop' into develop