Updated and new
Merge pull request #82 from SmakyTaky/master

Updated and new