Merge pull request #18 from ooiepe/epedev-3.3-pre-release-bugfix

Bug fixes for 354 and 293
epedev-354 bug fix

missing additional conditional checking in resource module's api request
for author resource
Merge remote-tracking branch 'origin/develop' into epedev-3.3-pre-release-bugfix