Added more input types
Merge branch 'develop' into gh-pages