Version 0.6.3
Last update from 0.6 svn