Merge pull request #4 from anonan/master

Pull request for 2/11 version