Changed documentation and added some new tests based on review comments of #86