Merge pull request #631 from zorkow/develop

Version 4