stuff
Merge branch 'master' of github.com:CSarabalis/8.14_2013