merge gh to master #5

Merged
merged 18 commits into from Jul 14, 2014

Conversation