Fixes bullet issue
Improves locale detection
Fixes #11