new and updated
Merge pull request #107 from SmakyTaky/master

new and updated