Update for language changes #50

Merged
merged 3 commits into from Aug 29, 2013