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

new and updated