GH-3 2014 shokan
Merge pull request #3 from ngs/draft

2014 shokan