#22 - Fixed the cross-platform stuff