Fixed, added test, updated readme