Modified include paths. Added some features.