Resolving conflicts with master and adding documentation