changes
Merge branch 'dev' of https://github.com/krzygorz/JSC into dev