Fixing issues: #118, #134, #115 and #116