Combines styles
Updates test suite
Updates README