final touches
Merge pull request #4 from mwhammond/master

final touches