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

new and updated