Fix for issues #2, #3 and #4.