Fixing include and data location.
Adding command line option for data location.