Merge pull request #5 from novirael/bug_1617

Bug 1617
Merge branch 'master' into bug_1621