Merge to master branch
 - Merged branches Adam and Optical