Modified make file. Make more generic