uploading changes for richard
Merge remote-tracking branch 'upstream/master'
Merge pull request #275 from jkuk/master

changes for richard