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

new and updated