Added stuff to get a better and more easy release