Merged solution 13

Testing gave strange behaviour