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

new and updated