minutiae
Merge pull request #271 from dubslow/master

minutiae