solution 0007
Merge branch '0007' into solution