Don't use deprecated method
Merge branch '0.2'