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

new and updated