Added function for issue #43
Merge branch 'master' into frontend
Stuff