refactor.
Merge pull request #93 from birkin/master

refactor.