Bugfix
Merge branch 'development' of github.com:fachexot/AMOS-SoftwareForge into development