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

new and updated