Safe JSON parse method
Fixed Stack and Principal selectors
Merge branch '1.0.7-RELEASE'