Fixes #586 + small bug
Change output when version is specified