Improved version, travis tests modified, and some tests written.