Merge pull request #32 from pepetreshere/2014/10PR-FDU-602

FDU-602
Merge pull request #38 from pepetreshere/master

Merge pull request #32 from pepetreshere/2014/10PR-FDU-602