Merge pull request #12 from hfaran/dev

Change `dev` links to `master`; fixes #11