Fixed issues: #92, #94, #95