Merge pull request #56 from jvillanti/master

Good to go.