Merge pull request #5 from eldondev/master

A couple of updates and intelligent defaults.