fix bug 101
merged bug fux 101
dev with tequila