MergeUpdates

-merging latest changes from /program/ANN.py