sammi 20141229
Merge remote-tracking branch 'origin/master'