Fixed declaration and definision mismatches (#148)