Merge pull request #28 from Rapotkinnik/upstream