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

new and updated