Fixes FromStr moving locations
Merge pull request #17 from bcg/bcg_nightly

Fixes FromStr moving locations