Issue #24 bump module version
Merge remote-tracking branch 'upstream/master'