initial commit vefore merging with upstream
merging upstream and fork
updated README with new functionality