Closes #287. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Tested-by: Will Newton <will.newton@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>