* commit 'alex/master':
  expand path (to help prevent double-require warnings)
  cleaned up options specifications