Implmented Cancel button, fixes #13