Merge for accordance between 2.0.0 and 1.0.0
review from @DudePascalou
review from @juherr