code cleanup: #21
Merge pull request #25 from ahebert/master

code cleanup: #21