Fixes #216
Merge pull request #220 from akkie/cross

Fixes #216