Prevent instance variable not initialized warnings
Merge pull request #14 from Phrogz/master

Prevent instance variable not initialized warnings