Fix 5
Fix 14
Fix 12
Merge remote-tracking branch 'origin/dev-nick2.0'

Solved conflicts and merged the branch.