Merge pull request #114 from lioncash/misc-things

Misc things
Fix erroneous assignment in an if statement.

Should have been a comparison.