lergo-158 : scroll position issue 
lergo-246: comments
lergo-172: completion
Merge pull request #112 from lergo/lergo-172-final-commit

lergo-158 : scroll position issue