Change to included module - fixes #10 and #13