Some minor sorting optimizations
Small bug in setup configuration
Merge pull request #485 from dracony/master

Small fixes to PHPixie implementation