Merged changes from nikola