updates and new
Merge pull request #88 from SmakyTaky/master

updates and new