Cleaned fields some and added mixed addition of points
Merge branch 'master' of github.com:Bren2010/ecc