Fix Issue #1 and add elpa setup steps