Removed hard-coded include paths
Merge remote-tracking branch 'origin/master' into include_directories
Merge pull request #5 from wang1262/include_directories

Include directories