Merging code from svn to Github

1. Merging code. SVN version number 5.