Add Locko
Merge pull request #1737 from rimenes/locko

Add Locko