Import from SVN, typo fix and marked as version 4