5.4, 5.5
Merge pull request #7 from sattoke/satBranch

5.4, 5.5