Merge pull request #16 from jstockwin/development

Fixed issue #14