Merge pull request #6 from pcapriotti/master