Merge pull request #1 from tebu/master

Updated to 29.10
Merge pull request #19 from syymza/master

Merge pull request #1 from tebu/master