Issue #1103 #1104 1105
Merge pull request #1106 from MitrahSoft/develop

Fix for Issue #1103 #1104 #1105