Fixed JIRA NSM-249
Merge pull request #48 from prusso-sse/master

Fixed JIRA NSM-249