Major improvements; Added a first dist jar