bug fix 1
merged bug fix 1
dev