Fixed #34. Also fixed an issue where modules would be corrupted when performing a selective import.