Fixed else/elseif conditionals
Merge pull request #11 from dpeek/development

Fixed else/elseif conditionals