Commit for Version 2.0

New and improved API class