Removed unnecessary includes.
Changes
Bug fixes.
Merge remote-tracking branch 'origin/master'