Fixes #8 + push new files not added in last commit