Bug #1378583

Fixed
Merge pull request #114 from surakula/master

Bug #1378583
Merge pull request #115 from Juniper/master

Bug #1378583 merge