Updated to bundle stadnards

Closes #26 and #50