Merge pull request #2 from ideea/master

Pull to ZhukV repo
Merge pull request #24 from ZhukV/master

Pull to ZhukV repo