Merge pull request #39 from SuperstarDonkeyJockey/master

attempt to fix failing tests