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

new and updated