version 2 (fixes)  and a more compact one
Merge branch 'master' of github.com:mskoenz/EAGLE_solution