Testing flags

Updated PR on top of code in #92