Finished/fixed #208