port to poirot
Merge pull request #59 from jvcasill/master

port to poirot