cleanup
added everything back
Merge pull request #17 from nbriz/master

ok... second times a charm