This has been implemented as discussed above. Please review :).