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

new and updated