Merge issue1 with master

Please