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

New and updated