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

New and updated