Guy to fixed #32
Merge branch 'master' of https://github.com/justaway-factory/justaway