Merge pull request #10 from rezakhadjavi/master

missing files
Merge pull request #12 from rezakhadjavi/master

conflicts resolved
scroller change