Sprint 5

Merge from sprint 5 to Master