Closes #5

Please publish after merge so we can get rid of rc.