Merge pull request #348 from Alexpux/develop

Updates
Merge commit '831635d413436b46b7f274fa9379c9e5dda13395' into develop