Updated Naive Bayes
merging nB branch