added an option for maxWidth
Merge branch 'dev'