Resolves issues: #5