Initial version for 0.6.3
Initial version 0.7 from svn