Fixed some bugs
Bumped version