#12 merge conflict BS fixes