First version
Merge pull request #1 from prologism/master

Pull 1