Address issues #16 and #17