Version 0.5.1 - Closes issue #5