First commit, version 1.1