#17
fixed master version