fix #322
Merge branch 'master' of github.com:nullas/appleseed