merging nbeams into master

finally