Bugfixing & improved recognition ( = release 0.4)