Merge branch 'develop-support-types' into 'master'

Added support for all types.

See merge request !12