Merge pull request #135 from ryanburnette/master