Fixed warnings as shown by the extra compile flags.
Merged pull request #91
Merge branch 'xdebug_2_2'