Fixes issues #14, #15