Merging Master and Basic Structure to have a stable version for the start.