Merge remote-tracking branch 'upstream/master'
implementing Wahib's suggestions
Merge branch 'master' of http://github.com/yl790/ChronoZoom