[#4] Fixed issues dscribed in comments under last commit