Bumped version
Minor optimizations