fixes #278
Merge remote-tracking branch 'scalanlp/master'