applied PR #63 to master