Merge pull request #21 from wilsonge/development

Changes for version 1.3.3