Merge pull request #138 from efabless/EF-3367

EF-3367