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

New and updated