Merge pull request #1 from ChrisBoesch/master

update
update for cosmatic change and auto advance problem resolved
Merge pull request #9 from LI-HE/master

update for cosmatic change and auto advance problem resolved