update to nikola master