Merge pull request #28 from modcloth/merge_fix_modcloth

Merge fix modcloth
Merge branch 'master' into force_name_flag_fix