Initial commit

Committing current version 2.6