Various changes
Various changes
First github commit of nearly functional version 2. Develop in github from now on