Merge remote-tracking branch 'upstream/master'
model update Dec 17 2014
Merge remote-tracking branch 'upstream/master'
model update
Merge pull request #136 from lochana/master

model update