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

new and updated