new, updated and fix
Merge pull request #101 from SmakyTaky/master

new, updated and fix