final touches
Merge pull request #5 from mwhammond/master

final touches