Adding new file and new function
Merge branch 'devel'