Merge pull request #231 from TrevorPilley/develop