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

new and updated