some predicates and more specifcations
towards hierarchical naming
formatting
fix travis?
merge from development (with failing test for CI testing)