bug fixin
Merge branch 'master' of github.com:magus/insight

* 'master' of github.com:magus/insight:
  bug fixin