Fixes for the issues #2, #3, #4