Merge pull request #78 from rvandegrift/master