Merge pull request #17 from mihaipopescu/include-paths

fixed inconsistent include paths