Merge pull request #41 from qvarnis/master

New version