PHP 5.4 Strict Standards
Merge branch 'master' into develop
Merge pull request #3 from sime/develop

PHP 5.4 Strict Standards