initial commin
Merge remote-tracking branch 'origin/master'

merge test:
http://d.hatena.ne.jp/hyoshiok/20130505/p1