Finished work on most part of version 1.1