Remove unnecessary typename keyword

This should help with #57
Merge remote-tracking branch 'upstream/master'