added return option
Merge branch 'master' of https://github.com/Krzychuuu/ProjektJS