Merge pull request #7 from kblinova/master