FromStr fixes
Merge pull request #30 from vhbit/from-str

Update to nigtly: FromStr