Tidying up
Testing on Node (fix #107)