resources now work in jar maybe???
Merge origin/master