Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Issue #42
Solved Issue #43
Merge branch 'master' into development