Update for trunk
Merge pull request #28 from whitequark/trunk

Update for trunk