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