Merge pull request #1 from tebu/master

Updated to 29.10