Merge pull request #47 from JonathanO/master

Strict type checking and general type handling improvements.
fix "Strict Standards: Only variables should be passed by reference"
Merge pull request #48 from mentalstring/master

fixes warning when running with E_STRICT