Merge pull request #4 from anonan/master

Pull request for 2/11 version
Merge pull request #3 from mystics/master

Merge pull request #4 from anonan/master