Master fixes #43

Closed bmcafee closed 2 months ago