Created by: RosalynLP
This is an updated version of the pull request #247. Hopefully it's in better shape...