Merge pull request #90 from gizmo98/patch-2