updated to v1.5b-17