Work on issue #17. Added energe-based arranger