Many small udpates
Merge pull request #480 from shutter111/master

Many small udpates