Implemented  Enhancement #1

Made project buildable by including the files in project (in source but
not linked in project). Added the requested enhancement. Minor
improvements.
Would you mind doing it and then force push this branch? Thanks!