Merge pull request #145 from Nekotekina/master

Fixed conflicts.