Merge pull request #2 from krodyrobi/master

pull
=Bug fixing
Major bugfix
Major bugfix