fixed some troubles, closed #17