ak-sprint-1

This merges the changes from the ak-team from sprint 1 into the development branch