Merge pull request #16 from huangnoah/master

remove code
minor fix scroll function