Merge pull request #1 from valleybay/development

Mergin development into master. No problem.
Merge pull request #3 from valleybay/forum

Merging upstream for delivery
Final push for delivery