Merge pull request #40 from cnlpete/release/4.1

small adjustments