Merge pull request #7 from scienceexchange/master

Add nil param argument checking
Merge remote-tracking branch 'upstream/master'