nuclearmistake Merge pull request #53 from hikimmm/master