Addresses issues #1 and #12