Merge pull request #4 from sfischer13/master

Fixed two bugs, changed long lines, some automatic formatting.