update
Merge pull request #3 from thunderdomes/development

update