modified all the src classes to work with php 52
Merge branch 'release/2.0.0'