Merged.
Minor corrections.
Merge branch 'master' of http://github.com/yuhhey/fotoworkflow