Merge Code 2014-11-12 By MACZ