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

new and updated