Merge pull request #1 from nazieb/master

update