Merge pull request #1 from phlco/development

test
updates