newv2
Merge pull request #5 from mike96/master

pull request
fonja