Initial version 1.1 commit
Finished work on most part of version 1.1