Merge pull request #1 from tfgg/master

fix tests