fixed gradle building
merged kevin's changes