josefbacik Merge pull request #1 from satoru-takeuchi/satfix