Merge pull request #117 from wtaverni/master