Removed the unmerged parts.
Changed the include path in afterarg.
Merge pull request #16 from karlito139/develop

Removed the unmerged parts.