Redefined data reader constructor and fixed Issue #84.  Also, started working on making some files follow style conventions closer.