Version update
Merge pull request #315 from jaredbischof/master

Version update