Fork modification
Merge pull request #1 from silentfuzzle/master

Fork modification merge