Address issues #15