Check forking
Merge pull request #1 from SherkanerUnderhill/master

Some fixes