Implemented changes suggested by hound
development_27