fix to wp issues
fix to warnings
Merge pull request #22 from ENEYSolutions/development

Development