Changed object to use forward declaration in header
Merge branch 'master' into gui
Updating Makefile to build