Updates...
Merge branch 'devel-share' of https://github.com/rhodricusack/automaticanalysis into devel-share