Merge pull request #8 from chemist/pipes

update master