5.5.29-r30
Merge pull request #6 from Danez/master

5.5.29-r30