Updated non-class based functions.

Updated non-class based functions.
Merge remote-tracking branch 'origin/master'

Conflicts: neuralnetwork.py