Issue #227 - Adding function