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.
If I did it, it's not done on purpose. Feel free to revert that change.