closed #12, merged two gradle buildfiles