Merge pull request #2 from pcapriotti/master