fixed gradle build version + changed code to support