#179 with changes

Test to see if CI build passes.