Master added. There are yet some things to be implemented.