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

new and updated