Merge tag '0.4' into develop

tagging 0.4
add support for xhprof
Merge branch 'release/0.5'