update so it should work on any computer now
Merge origin/master