Initial import and updates from svn repo