fixed next issue at end
Merge branch 'development'
Merge branch 'master' of github.com:dyep49/alex into development
Merge branch 'development'