Merge release/v0.5.20 into develop
Added some extra fields to prevent exceptions
Merge pull request #20 from nodesagency/feature/page-field

Added some extra fields to prevent exceptions
Merge branch 'develop'