master commit

master commit
Merge remote-tracking branch 'origin/Version-1.1'
file5
file6
Merge pull request #1 from PaulSJ/master

Pull request