closes #64, Thanks Christian :)