uberjar preparation, added main function
resolved merge conflicts in readme and source