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

new and updated