Added --version command line argument.
updated version numbers for release 0.3.4
release 0.3.4
updated from master and resolved conflicts
Merge pull request #2 from gsdlab/release-0.3.4

Release 0.3.4