Merge pull request #1 from aui/master

fix bug #170