Improving code, see Pull request #158
Merge remote-tracking branch 'origin/master'