#176 Implemented functionality

Merge for #176