tweaked jakefile
merged jakefile