merged with current version http://xcncip2toolkit.googlecode.com/svn/