V2.0 commit

Version 2.0 commit as a backup on github