refactored fragement structure (fixes #23)
merge