added typecomp
Merge branch 'master' of git.kbase.us:m5nr
Merge branch 'master' of git.kbase.us:m5nr
initial version
fix conflict
updated config