Merge pull request #77 from hwdro/master

Small code cleanup.