merging master up to dev

dev was missing README.md