Merge pull request #1 from vasken/master

A bit of cleanup
test