fixed #11, fixed #14, fixed #15
Merge branch 'master' of https://github.com/jokio/jok-starwars.git