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

new and updated