Merge pull request #98 from tbeckham/testing

Version 0.3.17