Removed some warnings, added HX base class
Merge remote-tracking branch 'refs/remotes/origin/master'