Issue #17.1, January 2017

in #17.1