Merge pull request #363 from Alexpux/develop

Updates.