Merged changes from dev branch
Added --version support