Fix issues #43 and #44

for issue #43 use commit c00eae7 and for issue #44 use commits 89f8b8b and b768da9 .

Please, ignore other commits