Fixes #58. Update for CustomDeclarationOrderCheck.
Merge pull request #136 from baratali/iss58

Fixes #58. Update for CustomDeclarationOrderCheck.