Merge of exercise 1 skeleton fixes