Fix issues #44 & #110
2 files changed