Merged with feature-4. Version updated. Closes #4