Feature/masbootstrap

by aza