add tags to method names
add rcov
fix merge conflict