update
Merge branch '1.1' of https://github.com/koolhazz/LokiD into 1.1