Steria @ EL5
Merge pull request #24 from dotKom/2014-tweaks

Steria @ EL5