update
1. add
Merge branch '1.2' of https://github.com/koolhazz/LokiD into 1.2
1. updated