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

new and updated