Merge pull request #26 from Phaneron/master

Suppose to pull to develop not master.