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

new and updated