merge with svn
fixed bug with pager