Merge pull request #102 from Nekotekina/master

Different changes