Added simple mapping functions, closes issue #4