V1.1

merge latest branch into master