Merge pull request #421 from sguada/argmax_layer