Merge pull request #94 from Nekotekina/master

Different changes