Cleanup.
Merge pull request #139 from dariomanesku/master

Cleanup.