Update.

Updated with things from the last round.
Merge branch 'master' of github.com:Necrolgan/evsource
Fix to artiefact.