Simple clean up
Merge pull request #18 from danielsoro/simple-clean-up

Simple clean up