Added segments fixes #33