.
Merge remote-tracking branch 'upstream/master'
.
.
.
.
.
Merge remote-tracking branch 'upstream/master'
.
.
.
.
.
.
Merge remote-tracking branch 'upstream/master'
'merge conflicts'
..
.
.
Merge pull request #228 from kiranhugo/master

fixed some minor issues
.