Merge pull request #25 from kreczko/master

updates