Fixed some warnings by matching argument types
Merge remote-tracking branch 'GitHubView/master'