Merge pull request #371 from Alexpux/develop

Updates.