merge with my devel version + latest updates from svn (rev.802)