fixes #36
fixes #37
work on #37.
CES merge fix