Added a few things to .h files
Merge remote-tracking branch 'origin/master'