Merge pull request #13 from cdman/development

Adding latest updates from upstream