Minor juggling
Merge pull request #5 from cfv1984/development

Minor juggling