Code cleanup
Added include dir option