Merge pull request #27 from cdman/development

Merge latest changes from upstream.