namespace change, code clean.
Tweeks to cursor filter.
Merge branch 'master' of https://github.com/cschladetsch/Incode