Ben Shi - 2016-01-29

Thanks to Peter's patch and Philipp' help. :)