Merge branch 'master' of https://github.com/chise/ids into 3type-fix