Remove .properties files
Don't jump the list if down & soft update occurs
Fix NPE
Merge pull request #25 from vishna/master

Don't jump the list & get rid of properties files