Merge Dev branch into master. Jets and machines will be back later. :)