master default consolidate develop feature/#16 junit_support