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

new and updated