Merge pull request #148 from fly-man-/master

Small cleanup