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

new and updated