replace prev/next buttons if already there
fix potential circular depency
force property to number to resolve iPhone bug
Merge pull request #1 from mboinet/master

get modifications