Merge pull request #740 from samsulmaarif/master