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

New and updated