Issue #63
Version 3.1.1