Merge pull request #5 from cfoellmann/fixes-only

fixes for PHP 5.4
bump version to 1.2.1