Enable having separate yarm instances, update to 0.3.6