Changes for #4
Merge branch 'master' of github.com:fluxitsoft/jqa