Sherlock implemented.
Merge branch 'develop'