Integrated Josh's changes, linkified issues (closes #13)