Fixes Issues #2 and #4

Added more functions for water mills