Dupa

Close #2, #3