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

new and updated