Dupa

Close #3
Close #4