Feature/enhancements #12

Closed hreid3 closed 2 years ago