Merge master to algorithms

Get newest stuffs