Merge pull request #1 from istudens/master

fixing a few simple/silly bugs
commenting out the check if a PR is mergeable