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

New and fixes