Merge pull request #39 from narner/master

Deleted "EnergyReturn" parameter