Fixed #213 by adding properties argument and more tests.