Last bloody changes. Woe to us.
Merge pull request #13 from TorChrEriksen/EA

Last bloody changes. Woe to us.