Merge pull request #93 from erasaur/master

Minor changes