Pull latest changes from ralsina/nikola