Merge pull request #26 from Phaneron/master

Suppose to pull to develop not master.
Merge pull request #27 from Phaneron/develop

Merge pull request #26 from Phaneron/master