Added type checks to existing properties. Fixes #21.