New and fixes
Merge pull request #102 from SmakyTaky/master

New and fixes