Added API 21 (Lollipop) support.