Close GH-76. Add as package