Do a hard pull to avoid conflicts
Merge pull request #1 from BOFHers/master

Do a hard pull to avoid conflicts