getting softmax to work
Merging release into master.