Merge branch 'master', remote-tracking branch 'upstream/master'
Reintegrate change in post model to fix Issue #168
Merge pull request #174 from msevestre/update_bug

Fixes  Issue #168 with update Problem