Improved minification. Added test case.