Update Check 20131209
Resolves Conflicts