Issue #136

Adding final