Merge pull request #60 from jeremyBass/master

updating testing platform