Resolves issues: #6