New and updated
Merge pull request #138 from SmakyTaky/master

New and updated