#20: cleaning master branch, preparing website release 1.1