This closes #2 (i hope this shortcode on commit works)