Added assertion for error message when argument missing [closes #3]
Merge remote-tracking branch 'origin/master'