Merge pull request #111 from BluWings/master

minor code cleanup