Fix build after PR #137 #138

Merged
merged 1 commit into from Jan 30, 2015