Small clanup.
Merge pull request #17 from tpasternak/dev

Small clanup.