Merging alex and master branch

Comment for merging commit or something.