Fixed 2 bugs

#33 and #34