Updated to work with latest master of Rajawali.