updating if..else statement
Merge pull request #18 from nodejsnyc/develop

updating if..else statement and other minor updates
Merge pull request #19 from EladElrom/master

master
refactoring
Merge pull request #20 from EladElrom/develop

develop