Merge pull request #41 from cnlpete/release/4.1

development