testing a new release with changes
Merge branch 'master' of github.com:sovaa/entropia-calc