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

new and updated