Fixed race condition
Merge branch 'master' of github.com:ReidE96/ilwhack-2014