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