Fixed all issues
Merge pull request #1 from greglockwood/fix_issues

Fixed all issues
Merge pull request #1 from fredk212/master

Trying to merge upstream using Github website