FDU-553
Merge pull request #23 from pepetreshere/2014/08AC-FDU-553

FDU-553