Fixed issues: #92, #94, #95

Fixed issues: #93