Merge pull request #25 from NateJacobs/dev

Update to 1.3