Merge pull request #24 from efabless/EF-3367

EF-3367