Fixed path for status resource
Merge remote-tracking branch 'origin/pr/36' into develop

Forward port #36