Fixes issues #3 y #4