NejcHorvat branch, state and test server fixes
Package updated
Merge pull request #6 from NejcHorvat/master