Fixed : Bug #1389448
Merge pull request #117 from surakula/master

Fixed : Bug #1389448
Merge pull request #118 from Juniper/master

Bug #1389448  merge