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

New and updated