Pulled latest changes from SurvanaJS