Merge branch 'development'
Merge pull request #1 from JeroenBo/master

New functions