Code complete
Merge pull request #1 from tomtomssi/development

Code complete