finish-feature

Complete and merge feature branch