Merge pull request #35 from cdman/development

Merged with updates from upstream