first import from 0.7.1 SVN