manually merged changed from master branch
updated FW/1 to version 2.1