Fixes #41 and #85.
Metadata Update from @gioma1: - Request assigned
Pull-Request has been merged by gioma1