Merge pull request #4 from jvrunion/master

first push of a clone of energy