sadasdas

fixes #1, #3