Start of work for issue #7 - uses make and works on mac. Backward compatability maintined if option set