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

new and updated